Don't claim to have handled the accelerator if the action is insensitive.

2004-11-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaction.c (closure_accel_activate): Don't claim to have
	handled the accelerator if the action is insensitive.  (#151541,
	Jody Goldberg)

diff --git a/ChangeLog b/ChangeLog
index e310fe45a2b2c7462dbcc9cd149851ef77856b21..199d702fa339ffc3268de7d36daf7144d53b4f57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaction.c (closure_accel_activate): Don't claim to have
+       handled the accelerator if the action is insensitive.  (#151541,
+       Jody Goldberg)
+
        * docs/tools/widgets.c: Add a combo box.
 
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e310fe45a2b2c7462dbcc9cd149851ef77856b21..199d702fa339ffc3268de7d36daf7144d53b4f57 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaction.c (closure_accel_activate): Don't claim to have
+       handled the accelerator if the action is insensitive.  (#151541,
+       Jody Goldberg)
+
        * docs/tools/widgets.c: Add a combo box.
 
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e310fe45a2b2c7462dbcc9cd149851ef77856b21..199d702fa339ffc3268de7d36daf7144d53b4f57 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaction.c (closure_accel_activate): Don't claim to have
+       handled the accelerator if the action is insensitive.  (#151541,
+       Jody Goldberg)
+
        * docs/tools/widgets.c: Add a combo box.
 
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e310fe45a2b2c7462dbcc9cd149851ef77856b21..199d702fa339ffc3268de7d36daf7144d53b4f57 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaction.c (closure_accel_activate): Don't claim to have
+       handled the accelerator if the action is insensitive.  (#151541,
+       Jody Goldberg)
+
        * docs/tools/widgets.c: Add a combo box.
 
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 0df7a21868a9b2b99ef2179a94736e4643baa083..bb3c4242d3928bd055af1c662b5d41df5fdbf931 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -1398,10 +1398,12 @@ closure_accel_activate (GClosure     *closure,
                         gpointer      marshal_data)
 {
   if (gtk_action_is_sensitive (GTK_ACTION (closure->data)))
-    _gtk_action_emit_activate (GTK_ACTION (closure->data));
-
-  /* we handled the accelerator */
-  g_value_set_boolean (return_value, TRUE);
+    {
+      _gtk_action_emit_activate (GTK_ACTION (closure->data));
+      
+      /* we handled the accelerator */
+      g_value_set_boolean (return_value, TRUE);
+    }
 }
 
 static void